Unconditionally write Cargo.lock

Otherwise `cargo-update` ends up not doing much because all sources are
considered equal regardless of their precision.

diff --git a/src/cargo/ops/cargo_generate_lockfile.rs b/src/cargo/ops/cargo_generate_lockfile.rs
index ced7788ee01d7e602eda32a3eee666c4fb274370..db0d24b2d1d176df04e97a4629fac7f2024446e8 100644 (file)
--- a/src/cargo/ops/cargo_generate_lockfile.rs
+++ b/src/cargo/ops/cargo_generate_lockfile.rs
@@ -116,11 +116,6 @@ pub fn load_lockfile(path: &Path, sid: &SourceId) -> CargoResult<Option<Resolve>
 
 pub fn write_resolve(pkg: &Package, resolve: &Resolve) -> CargoResult<()> {
     let loc = pkg.get_root().join("Cargo.lock");
-    match load_lockfile(&loc, pkg.get_package_id().get_source_id()) {
-        Ok(Some(ref prev_resolve)) if prev_resolve == resolve => return Ok(()),
-        _ => {}
-    }
-
 
     let mut e = Encoder::new();
     resolve.encode(&mut e).unwrap();

diff --git a/tests/test_cargo_generate_lockfile.rs b/tests/test_cargo_generate_lockfile.rs
index 4e7823136bd2f5f0054690bfc978c2a1afa703ea..0208bdd773dff11e7d4c8c2fe9066d615a91efd0 100644 (file)
--- a/tests/test_cargo_generate_lockfile.rs
+++ b/tests/test_cargo_generate_lockfile.rs
@@ -27,11 +27,8 @@ test!(ignores_carriage_return {
     let lock = lock.assert();
     let lock = lock.as_slice().replace("\n", "\r\n");
     File::create(&lockfile).write_str(lock.as_slice()).assert();
-    lockfile.move_into_the_past().assert();
-    let mtime = lockfile.stat().assert().modified;
     assert_that(p.process(cargo_dir().join("cargo-build")),
                 execs().with_status(0));
-    assert_eq!(lockfile.stat().assert().modified, mtime);
 })
 
 test!(adding_and_removing_packages {